Merge changes I5a3b876c,I81799165 am: 30604fa086
am: 50f2282c43

Change-Id: I1d4caa2f8037c490d89db90a42b4154518acd83c