Merge changes I74d1f01c,I687b8694,Ie82e5cb9
am: 8b216baee2

Change-Id: I5f74c0d3de5a778132efe166eb063c45057e131c