Merge changes from topic "b116618418" am: 002fa789e6
am: 0e71219f40

Change-Id: I26d788bb7d034e1fff1c069685ae8a76673c39bc