Synced to developers/samples/android commit bc036ecdf44cd03163c206096172299f3940b057. Change-Id: Ib68230d79ca300e7db906aff2ebfc2cb6c6968f7
Change-Id: I71c6ff9a90b7734042d68af7f01e6d61118cc508