Merge "Signed-off-by: Shawn Lien <shawnlien@google.com>" am: 97e6f46cbb am: 3a7c24372f

Change-Id: I8f5a6b9a7d15b43bcf2b7f2a799e30841e85f18f