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

Change-Id: I4f97948bb12b0e3426e190e99cd8c2517163ee6f