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

Change-Id: I631a0914e2ae00dbe6b75307f2d4354220996b92