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

Change-Id: I9746ddade8714546ef285c9f844419a63e34602c