Merge "Synced the code from master branch" am: 8e54615a36
am: ec907faf78

Change-Id: Ifb214c9e7de74204404c9331660e32e96ca91315