Merge "Synced the code from master branch"
am: 64efbe1240

Change-Id: I042c2bb85876bf67acc98113f01186e831adeae5