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

Change-Id: Ic153c57baf6d994416b52d9eca36e7592e369ac3