Merge commit '83aa36d' into import
am: 4db398a410

Change-Id: I0ef0d7788c76a7b575ed25f58fbe9714fbe5038e