Merge changes I60f883c0,Ie5955865
am: 8c3e940324

Change-Id: I97b92d3ea89bd81798ec1ca0859197617970069b