Merge changes I104e6133,I54f04c03
am: 191ddb0c27

Change-Id: I7376f7594314c26926c3b41ffbe4202b865f9091