Merge tag 'v3.6.1' am: 600f716d51
am: 02d71e78ad

Change-Id: I80f10414953e34a5bbcf6fa4aeda7cf38177e919