am: 83aed73a Change-Id: Ie98ac6af77ecdce0350edad8b99276d7f1cb2035
mentioned in commit 48192794
mentioned in commit efc22969