Bug: 1136427 Change-Id: I411a341b551454ee3bd1215e3c6f5572d1555675 Signed-off-by: Andy Hung <hunga@google.com>