Merge commit 'f68eead36c0eb8f6f4e5c912dfe204c52bb7b7c5' to aosp/master

Change-Id: I8cfd6cd12923ca4ecb13195abb44f657eff11770
Signed-off-by: David Lin <dtwlin@google.com>