Merge commit 'cefe36ae9ffcb5a9d7a2be46af874c836a9db903' into HEAD
am: 8b2a732f06

Change-Id: Ic00a9475acb03e06b10049ae27703b8191f80a23