Merge changes from topic "b36424585" am: cc22f72529 am: 353be24ba6
am: 48467d71de

Change-Id: Iedeed683292696930c34a0daf99e27d6f4ecd93f