Merge commit 'f68eead36c0eb8f6f4e5c912dfe204c52bb7b7c5' to aosp/master
am: a51262b74c

Change-Id: Ibef26e416b8ae90dd6fed5d14194f878142957f0