Merge commit '226f45b08207a0faecfe2f6e66c62bb7713f4cf9' into aosp-merge

Bug: http://b/21471495
Change-Id: I225950ab25ab5a63f07940fb2208ede2655d0550