Merge changes I710a7703,Ib5fcffc8 am: 3120319db4
am: 17e968c723

Change-Id: I88010c35790afa7290303b9adf651465e91d883c