Merge changes I525bda55,Ie6445f00
am: 22fc95370c

Change-Id: I89ee46468d999713d1a324461ad292c5a2f7e772