Merge changes Iad45efb8,I06a4a790 am: 739d56a514

Change-Id: I8748cd2ee442aba7cdd4dc6a8b0b99fa5be8dd94