Merge changes Idf152091,I131f7aff
am: 6e2ecfeede

Change-Id: Ifbe29576a1d830229c78c78470f39f20cd59e5db